From 3910a9a278daff8e99bc9476af919aff0419d580 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 13 Oct 2008 10:08:16 +0100
Subject: [PATCH] iommu: Cleanups to some header files.

Signed-off-by: Anthony Xu <anthony.xu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 xen/include/xen/hvm/iommu.h | 12 +++---------
 xen/include/xen/iommu.h     |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h
index cf2c09883e..2a66956c77 100644
--- a/xen/include/xen/hvm/iommu.h
+++ b/xen/include/xen/hvm/iommu.h
@@ -17,16 +17,10 @@
  * Copyright (C) Allen Kay <allen.m.kay@intel.com>
  */
 
-#ifndef __ASM_X86_HVM_IOMMU_H__
-#define __ASM_X86_HVM_IOMMU_H__
+#ifndef __XEN_HVM_IOMMU_H__
+#define __XEN_HVM_IOMMU_H__
 
 #include <xen/iommu.h>
-#include <asm/hvm/irq.h>
-#include <asm/hvm/vpt.h>
-#include <asm/hvm/vlapic.h>
-#include <asm/hvm/io.h>
-#include <public/hvm/params.h>
-#include <public/hvm/save.h>
 
 struct g2m_ioport {
     struct list_head list;
@@ -53,4 +47,4 @@ struct hvm_iommu {
     struct iommu_ops *platform_ops;
 };
 
-#endif /* __ASM_X86_HVM_IOMMU_H__ */
+#endif /* __XEN_HVM_IOMMU_H__ */
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index e9bd9532aa..f230df7b8e 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -21,7 +21,6 @@
 #define _IOMMU_H_
 
 #include <xen/init.h>
-#include <xen/pci.h>
 #include <xen/spinlock.h>
 #include <xen/pci.h>
 #include <public/hvm/ioreq.h>
-- 
2.30.2